From 5a6064393f70b6c05b0da9c8c750fc3d058053c9 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Thu, 14 Jun 2018 16:32:56 -0600 Subject: [PATCH] cleanups for codacy warnings. (#192) take advantage of C++11 delete to block a default operator, and move a bunch of loop index declarations to the loop. --- alan.cc | 16 +++++----------- defs.h | 7 ++++--- exif.cc | 6 ++---- globalsat_sport.cc | 4 +--- gtrnctr.cc | 4 +--- humminbird.cc | 5 ++--- itracku.cc | 5 ++--- mtk_locus.cc | 3 +-- skytraq.cc | 4 ++-- tomtom.cc | 3 +-- util.cc | 12 ++++-------- waypt.cc | 8 -------- 12 files changed, 25 insertions(+), 52 deletions(-) diff --git a/alan.cc b/alan.cc index 5154e6128..2bcb68ee2 100644 --- a/alan.cc +++ b/alan.cc @@ -232,15 +232,13 @@ static void rev_bytes(void* dword) static void swap_wpthdr(struct wpthdr* wpthdr, void (*swap16_func)(void*), void (*swap32_func)(void*)) { - int i; - if (swap32_func != nullptr) { swap32_func(&wpthdr->id); } if (swap16_func != nullptr) { swap16_func(&wpthdr->num); swap16_func(&wpthdr->next); - for (i=0; iidx[i]); } } @@ -263,12 +261,10 @@ static void swap_wpt(struct wpt* wpt, static void swap_rtehdr(struct rtehdr* rtehdr, void (*swap16_func)(void*), void (*swap32_func)(void*)) { - int i; - if (swap16_func != nullptr) { swap16_func(&rtehdr->num); swap16_func(&rtehdr->next); - for (i=0; iidx[i]); } swap16_func(&rtehdr->rteno); @@ -281,11 +277,9 @@ static void swap_rtehdr(struct rtehdr* rtehdr, static void swap_rte(struct rte* rte, void (*swap16_func)(void*), void (*swap32_func)(void*)) { - int i; - if (swap16_func != nullptr) { swap16_func(&rte->wptnum); - for (i=0; iwptidx[i]); } swap16_func(&rte->reserved); @@ -422,11 +416,11 @@ static void trl_swap(struct trldata* trldata) static void str2lab(char* dest, const char* src, int len, const char* fmt, int n) { - int i,j; + int j; j = 0; if (src != nullptr) { - for (i=0; itags, elem, tmp) { exif_tag_t* tag = (exif_tag_t*)elem; if ((tag->size > 4) && (tag->value)) { - uint16_t i; char* ptr; tag->data = xmalloc(tag->size); @@ -505,7 +504,7 @@ exif_read_ifd(exif_app_t* app, const uint16_t ifd_nr, gbsize_t offs, if (BYTE_TYPE(tag->type)) { gbfread(ptr, tag->count, 1, fin); - } else for (i = 0; i < tag->count; i++) { + } else for (uint16_t i = 0; i < tag->count; i++) { switch (tag->type) { case EXIF_TYPE_SHORT: case EXIF_TYPE_SSHORT: @@ -1201,12 +1200,11 @@ exif_write_ifd(const exif_ifd_t* ifd, const char next, gbfile* fout) exif_tag_t* tag = (exif_tag_t*)elem; if (tag->size > 4) { - uint16_t i; char* ptr = (char*) tag->data; if BYTE_TYPE(tag->type) { gbfwrite(tag->data, tag->size, 1, fout); - } else for (i = 0; i < tag->count; i++) { + } else for (uint16_t i = 0; i < tag->count; i++) { switch (tag->type) { case EXIF_TYPE_SHORT: case EXIF_TYPE_SSHORT: diff --git a/globalsat_sport.cc b/globalsat_sport.cc index 0d09e3d34..e9721ca5d 100644 --- a/globalsat_sport.cc +++ b/globalsat_sport.cc @@ -292,8 +292,6 @@ globalsat_write_package(uint8_t* payload, uint32_t size) // gh561 (isSizeSwaped) //2 - uint32_t i; - uint8_t crc = 0; write_byte(2); @@ -310,7 +308,7 @@ globalsat_write_package(uint8_t* payload, uint32_t size) } if (payload != nullptr) { - for (i = 0; i < size; i++) { + for (uint32_t i = 0; i < size; i++) { write_byte(payload[i]); crc ^= payload[i]; } diff --git a/gtrnctr.cc b/gtrnctr.cc index 98d5a2856..a6916c6fa 100644 --- a/gtrnctr.cc +++ b/gtrnctr.cc @@ -191,12 +191,10 @@ gtc_rd_deinit() static void gtc_wr_init(const QString& fname) { - int i; - ofd = gbfopen(fname, "w", MYNAME); if (opt_sport) { - for (i = 0; i < MAX_SPORTS; i++) { + for (int i = 0; i < MAX_SPORTS; i++) { if (0 == case_ignore_strncmp(opt_sport, gtc_sportlist[i], 2)) { gtc_sport = i; break; diff --git a/humminbird.cc b/humminbird.cc index 1d9bde58f..d58d1ffb8 100644 --- a/humminbird.cc +++ b/humminbird.cc @@ -692,7 +692,6 @@ humminbird_write_waypoint(const Waypoint* wpt) { humminbird_waypt_t hum; double lat, north, east; - int i; int num_icons = sizeof(humminbird_icons) / sizeof(humminbird_icons[0]); be_write16(&hum.num, waypoint_num++); @@ -702,7 +701,7 @@ humminbird_write_waypoint(const Waypoint* wpt) // Icon.... if (!wpt->icon_descr.isNull()) { - for (i = 0; i < num_icons; i++) { + for (int i = 0; i < num_icons; i++) { if (!wpt->icon_descr.compare(humminbird_icons[i], Qt::CaseInsensitive)) { hum.icon = i; break; @@ -710,7 +709,7 @@ humminbird_write_waypoint(const Waypoint* wpt) } if (hum.icon == 255) { /* no success, no try to find the item in a more comlex name */ hum.icon = 0; /* i.e. "Diamond" as part of "Diamond, Green" or "Green Diamond" */ - for (i = 0; i < num_icons; i++) { + for (int i = 0; i < num_icons; i++) { char* match; int j; xasprintf(&match, "*%s*", humminbird_icons[i]); diff --git a/itracku.cc b/itracku.cc index effa3c292..11ea4d1c5 100644 --- a/itracku.cc +++ b/itracku.cc @@ -383,10 +383,9 @@ static void itracku_rd_ser_init(const QString& fname) { #if LATER - int i; if (0 == strcmp(qPrintable(fname), port_auto_detect_filename)) { dbg(1, "auto detecting port for iTrackU device"); - for (i=1; !fd && i= 4) { db(4, "rd_buf(): dump follows:\n"); dump[sizeof(dump)-1] = 0; - for (i = 0; i < (len+15)/16*16; i++) { // count to next 16-byte boundary + for (int i = 0; i < (len+15)/16*16; i++) { // count to next 16-byte boundary if (i < len) { snprintf(&dump[(i%16)*3], 4, "%02x ", buf[i]); snprintf(&dump[3*16+1+(i%16)], 2, "%c", isprint(buf[i]) ? buf[i] : '.'); diff --git a/tomtom.cc b/tomtom.cc index d8e355132..392905301 100644 --- a/tomtom.cc +++ b/tomtom.cc @@ -320,7 +320,6 @@ struct blockheader { static void write_blocks(gbfile* f, struct blockheader* blocks) { - int i; write_char(f, 1); write_long(f, blocks->size); write_float_as_long(f, blocks->maxlon*100000); @@ -334,7 +333,7 @@ write_blocks(gbfile* f, struct blockheader* blocks) write_blocks(f, blocks->ch2); } if (!blocks->ch1 && !blocks->ch2) { - for (i = 0; i < blocks->count; i++) { + for (int i = 0; i < blocks->count; i++) { char desc_field [256]; write_char(f, 2); if (global_opts.smart_names && diff --git a/util.cc b/util.cc index fec26db50..6a43459b1 100644 --- a/util.cc +++ b/util.cc @@ -934,12 +934,11 @@ endian_read_double(const void* ptr, int read_le) double ret; char r[8]; const void* p; - int i; if (i_am_little_endian == read_le) { p = ptr; } else { - for (i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { r[i] = ((char*)ptr)[7-i]; } p = r; @@ -962,12 +961,11 @@ endian_read_float(const void* ptr, int read_le) float ret; char r[4]; const void* p; - int i; if (i_am_little_endian == read_le) { p = ptr; } else { - for (i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { r[i] = ((char*)ptr)[3-i]; } p = r; @@ -980,7 +978,6 @@ endian_read_float(const void* ptr, int read_le) void endian_write_double(void* ptr, double d, int write_le) { - int i; char* optr = (char*) ptr; // Word order is different on arm, but not on arm-eabi. #if defined(__arm__) && !defined(__ARM_EABI__) @@ -995,7 +992,7 @@ endian_write_double(void* ptr, double d, int write_le) if (i_am_little_endian == write_le) { memcpy(ptr, r, 8); } else { - for (i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { *optr++ = r[7-i]; } } @@ -1005,13 +1002,12 @@ void endian_write_float(void* ptr, float f, int write_le) { char* r = (char*)(void*)&f; - int i; char* optr = (char*) ptr; if (i_am_little_endian == write_le) { memcpy(ptr, &f, 4); } else { - for (i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { *optr++ = r[3-i]; } } diff --git a/waypt.cc b/waypt.cc index 69665298a..7137784f2 100644 --- a/waypt.cc +++ b/waypt.cc @@ -688,14 +688,6 @@ Waypoint::Waypoint(const Waypoint& other) : // note: extra_data is not deep copied. } -Waypoint& Waypoint::operator=(const Waypoint& /* other */) -{ - // the default assignment operator is not appropriate as we do deep copy of some members, - // and we haven't bothered to write an appropriate one. - // this is a dummy so the compiler can catch attempts to use the assignment operator. - return *this; -} - bool Waypoint::HasUrlLink() const { -- 2.30.2